From 5c3a884ae5018f2c580d91e6530910d89ebb507a Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Fri, 23 Jul 2004 15:46:31 +0000 Subject: [PATCH] bitkeeper revision 1.1108.1.18 (410132d727sJm8mjzG0hN7Txe_COkg) Fix problem where a failed console connect terminates an existing console connection. --- tools/python/xen/xend/server/console.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/server/console.py b/tools/python/xen/xend/server/console.py index b3231beb12..9221600bdb 100755 --- a/tools/python/xen/xend/server/console.py +++ b/tools/python/xen/xend/server/console.py @@ -57,7 +57,7 @@ class ConsoleProtocol(protocol.Protocol): self.idx, str(self.addr[0]), str(self.addr[1])) eserver.inject('xend.console.disconnect', [self.idx, self.addr[0], self.addr[1]]) - self.controller.disconnect() + self.controller.disconnect(conn=self) def loseConnection(self): self.transport.loseConnection() @@ -211,9 +211,10 @@ class ConsoleController(controller.Controller): self.handleOutput() return 0 - def disconnect(self): + def disconnect(self, conn=None): """Disconnect the TCP connection to the console. """ + if conn and conn != self.conn: return if self.conn: self.conn.loseConnection() self.addr = None -- 2.30.2